radiotoolbutton: Remove deprecated API

diff --git a/gtk/gtkradiotoolbutton.c b/gtk/gtkradiotoolbutton.c
index c7519c29ad972dbc319e2dfaa735ec3e9dcb8f04..81665dddddf568e40b317cfd04c42f24f58cd331 100644 (file)
--- a/gtk/gtkradiotoolbutton.c
+++ b/gtk/gtkradiotoolbutton.c
@@ -149,40 +149,6 @@ gtk_radio_tool_button_new (GSList *group)
   return GTK_TOOL_ITEM (button);
 }
 
-/**
- * gtk_radio_tool_button_new_from_stock:
- * @group: (allow-none) (element-type GtkRadioButton): an existing radio button
- *   group, or %NULL if you are creating a new group
- * @stock_id: the name of a stock item
- * 
- * Creates a new #GtkRadioToolButton, adding it to @group. 
- * The new #GtkRadioToolButton will contain an icon and label from the
- * stock item indicated by @stock_id.
- * 
- * Returns: The new #GtkRadioToolButton
- * 
- * Since: 2.4
- *
- * Deprecated: 3.10: Use gtk_radio_tool_button_new() instead.
- **/
-GtkToolItem *
-gtk_radio_tool_button_new_from_stock (GSList      *group,
-                                     const gchar *stock_id)
-{
-  GtkRadioToolButton *button;
-
-  g_return_val_if_fail (stock_id != NULL, NULL);
-  
-  button = g_object_new (GTK_TYPE_RADIO_TOOL_BUTTON,
-                        "stock-id", stock_id,
-                        NULL);
-
-
-  gtk_radio_tool_button_set_group (button, group);
-  
-  return GTK_TOOL_ITEM (button);
-}
-
 /**
  * gtk_radio_tool_button_new_from_widget: (constructor)
  * @group: (allow-none): An existing #GtkRadioToolButton, or %NULL
@@ -206,40 +172,6 @@ gtk_radio_tool_button_new_from_widget (GtkRadioToolButton *group)
   return gtk_radio_tool_button_new (list);
 }
 
-/**
- * gtk_radio_tool_button_new_with_stock_from_widget: (constructor)
- * @group: (allow-none): An existing #GtkRadioToolButton.
- * @stock_id: the name of a stock item
- *
- * Creates a new #GtkRadioToolButton adding it to the same group as @group.
- * The new #GtkRadioToolButton will contain an icon and label from the
- * stock item indicated by @stock_id.
- *
- * Returns: (transfer none): A new #GtkRadioToolButton
- *
- * Since: 2.4
- *
- * Deprecated: 3.10: gtk_radio_tool_button_new_from_widget
- **/
-GtkToolItem *
-gtk_radio_tool_button_new_with_stock_from_widget (GtkRadioToolButton *group,
-                                                 const gchar        *stock_id)
-{
-  GSList *list = NULL;
-  GtkToolItem *item;
-
-  g_return_val_if_fail (group == NULL || GTK_IS_RADIO_TOOL_BUTTON (group), NULL);
-
-  if (group != NULL)
-    list = gtk_radio_tool_button_get_group (group);
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  item = gtk_radio_tool_button_new_from_stock (list, stock_id);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
-
-  return item;
-}
-
 static GtkRadioButton *
 get_radio_button (GtkRadioToolButton *button)
 {

diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h
index 1c76899336e252ab13b1122d891e7d2f9588c433..8d763d7b68f8d489811c12896533377343276af4 100644 (file)
--- a/gtk/gtkradiotoolbutton.h
+++ b/gtk/gtkradiotoolbutton.h
@@ -60,14 +60,8 @@ GType        gtk_radio_tool_button_get_type       (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_radio_tool_button_new                        (GSList             *group);
-GDK_DEPRECATED_IN_3_10_FOR(gtk_radio_tool_button_new)
-GtkToolItem *gtk_radio_tool_button_new_from_stock             (GSList             *group,
-                                                              const gchar        *stock_id);
 GDK_AVAILABLE_IN_ALL
 GtkToolItem *gtk_radio_tool_button_new_from_widget            (GtkRadioToolButton *group);
-GDK_DEPRECATED_IN_3_10_FOR(gtk_radio_tool_button_new_from_widget)
-GtkToolItem *gtk_radio_tool_button_new_with_stock_from_widget (GtkRadioToolButton *group,
-                                                              const gchar        *stock_id);
 GDK_AVAILABLE_IN_ALL
 GSList *     gtk_radio_tool_button_get_group                  (GtkRadioToolButton *button);
 GDK_AVAILABLE_IN_ALL